Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sun, 14 Feb 2010 17:31:45 +0000 (18:31 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sun, 14 Feb 2010 17:31:45 +0000 (18:31 +0100)

Trivial merge